Dump AtkStreamableContent properties

Also, simplify the format for links slightly.

diff --git a/tests/a11y/accessibility-dump.c b/tests/a11y/accessibility-dump.c
index ee72eb5b24b600bf44b56c7f685f563b062568ba..522ed386dd74cf90e3431c067e02fbb0fdf86f0c 100644 (file)
--- a/tests/a11y/accessibility-dump.c
+++ b/tests/a11y/accessibility-dump.c
@@ -370,20 +370,34 @@ dump_atk_hyperlink_impl (AtkHyperlinkImpl *impl,
 
   atk_link = atk_hyperlink_impl_get_hyperlink (impl);
 
-  g_string_append_printf (string, "%*sanchors: %d\n", depth, "", atk_hyperlink_get_n_anchors (atk_link));
+  g_string_append_printf (string, "%*sanchors:", depth, "");
 
   for (i = 0; i < atk_hyperlink_get_n_anchors (atk_link); i++)
     {
       gchar *uri;
 
       uri = atk_hyperlink_get_uri (atk_link, i);
-      g_string_append_printf (string, "%*suri %d: %s\n", depth, "", i, uri);
+      g_string_append_printf (string, " %s", uri);
       g_free (uri);
     }
+  g_string_append_c (string, '\n');
 
   g_object_unref (atk_link);
 }
 
+static void
+dump_atk_streamable_content (AtkStreamableContent *content,
+                             guint                 depth,
+                             GString              *string)
+{
+  gint i;
+
+  g_string_append_printf (string, "%*smime types:", depth, "");
+  for (i = 0; i < atk_streamable_content_get_n_mime_types (content); i++)
+    g_string_append_printf (string, " %s", atk_streamable_content_get_mime_type (content, i));
+  g_string_append_c (string, '\n');
+}
+
 static void
 dump_accessible (AtkObject     *accessible,
                  guint          depth,
@@ -425,6 +439,9 @@ dump_accessible (AtkObject     *accessible,
   if (ATK_IS_HYPERLINK_IMPL (accessible))
     dump_atk_hyperlink_impl (ATK_HYPERLINK_IMPL (accessible), depth, string);
 
+  if (ATK_IS_STREAMABLE_CONTENT (accessible))
+    dump_atk_streamable_content (ATK_STREAMABLE_CONTENT (accessible), depth, string);
+
   for (i = 0; i < atk_object_get_n_accessible_children (accessible); i++)
     {
       AtkObject *child = atk_object_ref_accessible_child (accessible, i);

diff --git a/tests/a11y/link.txt b/tests/a11y/link.txt
index ec2ab02f5521ce2731d2d7b0dd16acebcda26d40..70e5bf49fbe3fd5bf944457f352b7f55b251774b 100644 (file)
--- a/tests/a11y/link.txt
+++ b/tests/a11y/link.txt
@@ -19,5 +19,4 @@ window1
     action 0 name: click
     action 1 name: press
     action 2 name: release
-    anchors: 1
-    uri 0: http://www.gtk.org
+    anchors: http://www.gtk.org